From 52fe843b288ace2cfcfda10ec2cea0ea64a94245 Mon Sep 17 00:00:00 2001 From: Masashi Fujimoto Date: Wed, 23 Oct 2013 15:44:28 -0400 Subject: [PATCH] * lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change) --- lisp/ChangeLog | 4 ++++ lisp/battery.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b837766b3df..ab71da4e49d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-10-23 Masashi Fujimoto (tiny change) + + * battery.el (battery-pmset): Handle OS X Mavericks. (Bug#15694) + 2013-10-23 Stefan Monnier * progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of diff --git a/lisp/battery.el b/lisp/battery.el index d4e4d8b3a31..780278fc091 100644 --- a/lisp/battery.el +++ b/lisp/battery.el @@ -615,7 +615,7 @@ The following %-sequences are provided: (with-temp-buffer (ignore-errors (call-process "pmset" nil t nil "-g" "ps")) (goto-char (point-min)) - (when (re-search-forward "Currentl?y drawing from '\\(AC\\|Battery\\) Power'" nil t) + (when (re-search-forward "\\(?:Currentl?y\\|Now\\) drawing from '\\(AC\\|Battery\\) Power'" nil t) (setq power-source (match-string 1)) (when (re-search-forward "^ -InternalBattery-0[ \t]+" nil t) (when (looking-at "\\([0-9]\\{1,3\\}\\)%") -- 2.30.2